From: Carlhuda <carlhuda@tilde.io>
Date: Fri, 11 Apr 2014 22:04:44 +0000 (-0700)
Subject: Track Rust master
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~1119
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=677356b09472dbdf31a1595481182d1b5a409974;p=cargo.git

Track Rust master
---

diff --git a/libs/rust-toml b/libs/rust-toml
index c6bd1115b..aea7ecde1 160000
--- a/libs/rust-toml
+++ b/libs/rust-toml
@@ -1 +1 @@
-Subproject commit c6bd1115bd8403170f69b248270c05e63fd0e249
+Subproject commit aea7ecde1e0ada2e24d3e7804f3905b46f6edae4
diff --git a/src/bin/cargo-compile.rs b/src/bin/cargo-compile.rs
index 259572e5c..91f535639 100644
--- a/src/bin/cargo-compile.rs
+++ b/src/bin/cargo-compile.rs
@@ -9,8 +9,8 @@ use std::vec::Vec;
 use serialize::{Decodable};
 use hammer::{FlagDecoder,FlagConfig,FlagConfiguration,HammerError};
 use std::io;
-use io::BufReader;
-use io::process::{Process,ProcessExit,ProcessOutput,InheritFd,ProcessConfig};
+use std::io::BufReader;
+use std::io::process::{Process,ProcessExit,ProcessOutput,InheritFd,ProcessConfig};
 use cargo::{ToCargoError,CargoResult};
 
 #[deriving(Decodable)]